Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 12 Apr 2010 22:58:14 +0000 (22:58 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 12 Apr 2010 22:58:14 +0000 (22:58 +0000)

Trivial merge